macos: fix macOS build breakage

Fixes breakages due to recent refactoring around sizing changes.

diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c
index dd762543d0c2dfbaf52492c4d66ae2e8a4531a4a..e85ebf8805115c12b254af09aafd35d41448493d 100644 (file)
--- a/gdk/macos/GdkMacosWindow.c
+++ b/gdk/macos/GdkMacosWindow.c
@@ -230,9 +230,7 @@
   NSRect content_rect;
   GdkSurface *surface;
   GdkDisplay *display;
-  GdkEvent *event;
   gboolean maximized;
-  GList *node;
 
   surface = GDK_SURFACE (gdk_surface);
   display = gdk_surface_get_display (surface);

diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h
index 9dd2a7ba52264772767c0fe7e13f63a5b29254bf..6c04b070661271e64741731edcecfc459887e499 100644 (file)
--- a/gdk/macos/gdkmacossurface-private.h
+++ b/gdk/macos/gdkmacossurface-private.h
@@ -85,6 +85,11 @@ void               _gdk_macos_surface_get_shadow              (GdkMacosSurface
                                                                int                *right,
                                                                int                *bottom,
                                                                int                *left);
+void               _gdk_macos_surface_set_shadow              (GdkMacosSurface    *self,
+                                                               int                 top,
+                                                               int                 right,
+                                                               int                 bottom,
+                                                               int                 left);
 NSView            *_gdk_macos_surface_get_view                (GdkMacosSurface    *self);
 gboolean           _gdk_macos_surface_get_modal_hint          (GdkMacosSurface    *self);
 void               _gdk_macos_surface_set_modal_hint          (GdkMacosSurface    *self,
@@ -125,11 +130,6 @@ void               _gdk_macos_surface_set_opacity             (GdkMacosSurface
 void               _gdk_macos_surface_get_root_coords         (GdkMacosSurface    *self,
                                                                int                *x,
                                                                int                *y);
-void               _gdk_macos_surface_set_shadow_width        (GdkSurface         *surface,
-                                                               int                 left,
-                                                               int                 right,
-                                                               int                 top,
-                                                               int                 bottom);
 
 G_END_DECLS
 

diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index 5e528ca8e2916a96d5656307ad711cc561f40d63..7e0c15dfe2468e6a1e8fc04a959f2f096f7a0c66 100644 (file)
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -140,11 +140,11 @@ gdk_macos_surface_get_scale_factor (GdkSurface *surface)
 }
 
 void
-gdk_macos_surface_set_shadow_width (GdkSurface *surface,
-                                    int         left,
-                                    int         right,
-                                    int         top,
-                                    int         bottom)
+_gdk_macos_surface_set_shadow (GdkMacosSurface *surface,
+                               int              top,
+                               int              right,
+                               int              bottom,
+                               int              left)
 {
   GdkMacosSurface *self = (GdkMacosSurface *)surface;
 

diff --git a/gdk/macos/gdkmacostoplevelsurface.c b/gdk/macos/gdkmacostoplevelsurface.c
index 63d924c3a2f677c389b1407fb31ee7ed5264deae..dbd244bf4351de1e5d6ff80e49eff8d78e61a6b7 100644 (file)
--- a/gdk/macos/gdkmacostoplevelsurface.c
+++ b/gdk/macos/gdkmacostoplevelsurface.c
@@ -157,11 +157,11 @@ _gdk_macos_toplevel_surface_present (GdkToplevel       *toplevel,
 
   if (size.shadow.is_valid)
     {
-      _gdk_macos_surface_set_shadow_width (surface,
-                                           size.shadow.left,
-                                           size.shadow.right,
-                                           size.shadow.top,
-                                           size.shadow.bottom);
+      _gdk_macos_surface_set_shadow (GDK_MACOS_SURFACE (surface),
+                                     size.shadow.top,
+                                     size.shadow.right,
+                                     size.shadow.bottom,
+                                     size.shadow.left);
     }
 
   _gdk_macos_surface_set_geometry_hints (GDK_MACOS_SURFACE (self), &geometry, mask);